From 1492175a28ad2b01e2711152f306a77586fb1e86 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 20 Nov 2016 07:27:00 +0100 Subject: [PATCH] window: Remove unused destroy_draw_context vfunc --- gdk/gdkwindow.c | 11 +++-------- gdk/gdkwindowimpl.h | 2 -- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index f3661b8b14..de2a841821 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -2933,8 +2933,6 @@ void gdk_window_end_draw_frame (GdkWindow *window, GdkDrawingContext *context) { - GdkWindowImplClass *impl_class; - g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (GDK_IS_DRAWING_CONTEXT (context)); @@ -2945,17 +2943,14 @@ gdk_window_end_draw_frame (GdkWindow *window, "gdk_window_end_draw_frame().", window); return; } + g_return_if_fail (window->drawing_context == context); if (gdk_window_has_native (window) && gdk_window_is_toplevel (window)) gdk_window_end_paint_internal (window); - impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl); - if (impl_class->destroy_draw_context != NULL) - impl_class->destroy_draw_context (window, context); - else - g_object_unref (context); - window->drawing_context = NULL; + + g_object_unref (context); } /*< private > diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h index 680997d345..ab1c1801a1 100644 --- a/gdk/gdkwindowimpl.h +++ b/gdk/gdkwindowimpl.h @@ -307,8 +307,6 @@ struct _GdkWindowImplClass GdkDrawingContext *(* create_draw_context) (GdkWindow *window, const cairo_region_t *region); - void (* destroy_draw_context) (GdkWindow *window, - GdkDrawingContext *context); }; /* Interface Functions */ -- 2.30.2